Fix 307689

diff --git a/ChangeLog b/ChangeLog
index 5c582032256cf286cdf6c034c5794402a7115ca1..40994db64dd43d8e79d9bea4c6f3453582e899cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c: Update num_marked_dates as we
+       used to do.  (#307689, Thorsten Schoenfeld)
+ 
 2005-06-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c582032256cf286cdf6c034c5794402a7115ca1..40994db64dd43d8e79d9bea4c6f3453582e899cd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c: Update num_marked_dates as we
+       used to do.  (#307689, Thorsten Schoenfeld)
+ 
 2005-06-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5c582032256cf286cdf6c034c5794402a7115ca1..40994db64dd43d8e79d9bea4c6f3453582e899cd 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-06-14  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c: Update num_marked_dates as we
+       used to do.  (#307689, Thorsten Schoenfeld)
+ 
 2005-06-14  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 00a1e6864f8872e2e3e2eddfd0b57e59a825236e..be5ccff3947e828a1de1121b5a47719f12a3a1ce 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -599,6 +599,7 @@ gtk_calendar_init (GtkCalendar *calendar)
 
   for (i=0;i<31;i++)
     calendar->marked_date[i] = FALSE;
+  calendar->num_marked_dates = 0;
   calendar->selected_day = tm->tm_mday;
   
   calendar->display_flags = ( GTK_CALENDAR_SHOW_HEADING | 
@@ -3316,6 +3317,8 @@ gtk_calendar_clear_marks (GtkCalendar *calendar)
       calendar->marked_date[day] = FALSE;
     }
 
+  calendar->num_marked_dates = 0;
+
   gtk_widget_queue_draw (GTK_WIDGET (calendar));
 }
 
@@ -3337,6 +3340,7 @@ gtk_calendar_mark_day (GtkCalendar *calendar,
   if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == FALSE)
     {
       calendar->marked_date[day - 1] = TRUE;
+      calendar->num_marked_dates++;
       calendar_invalidate_day_num (calendar, day);
     }
   
@@ -3361,6 +3365,7 @@ gtk_calendar_unmark_day (GtkCalendar *calendar,
   if (day >= 1 && day <= 31 && calendar->marked_date[day-1] == TRUE)
     {
       calendar->marked_date[day - 1] = FALSE;
+      calendar->num_marked_dates--;
       calendar_invalidate_day_num (calendar, day);
     }